Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Sun, 2 Jan 2011 20:28:40 +0000 (15:28 -0500)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 2 Jan 2011 20:28:40 +0000 (15:28 -0500)
commitaabf1aabe3ddea44097b97c2ae6b0b49c8835694
tree4127fbf210c54dcdd79da2a243a5657aa7ccba70
parentccb8d0758e768de9599d98701ae4a30b9ab1c2e9
parent7daf931b1c748ac72364b945c05da252a1d22c20
Merge changes from emacs-23 branch
43 files changed:
admin/ChangeLog
doc/emacs/ChangeLog
doc/emacs/frames.texi
doc/emacs/maintaining.texi
doc/emacs/rmail.texi
doc/lispref/ChangeLog
doc/lispref/modes.texi
doc/man/ChangeLog
etc/ChangeLog
etc/NEWS.23
lib-src/ChangeLog
lib-src/ebrowse.c
lib-src/etags.c
lisp/ChangeLog
lisp/emulation/edt-mapper.el
lisp/eshell/em-hist.el
lisp/files.el
lisp/help-fns.el
lisp/isearch.el
lisp/mail/binhex.el
lisp/mail/mail-utils.el
lisp/mail/rmail.el
lisp/mail/rmailmm.el
lisp/term/w32-win.el
lisp/textmodes/rst.el
lisp/time.el
lisp/version.el
nextstep/ChangeLog
nextstep/Cocoa/Emacs.base/Contents/Info.plist
nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
nt/ChangeLog
nt/INSTALL
nt/README.W32
nt/configure.bat
src/.gdbinit
src/ChangeLog
src/fileio.c
src/image.c
src/keyboard.c
src/window.c
src/xdisp.c
src/xterm.c